Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 20:39:11 +0000 (13:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 20:39:11 +0000 (13:39 -0700)
commitec008766cb29bff122a5b564af696b1f8d46eeea
tree32a4127d15ef27f25110f3c600b78ee1c6dd407a
parentcb5cc04cf898e7d07eea2a7820d2185409180365
parentb7f3a8617ae4fb1efb7736a219a082c0f5ea8e86
Merge from trunk.